Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add geos, libzip, protobuf and qgis #80

Open
wants to merge 11 commits into
base: latest
Choose a base branch
from

Conversation

m-kuhn
Copy link

@m-kuhn m-kuhn commented Sep 16, 2020

F.Y.I

Maybe there is something of interest

# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://tracker.debian.org/pkg/gdal
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing adaption

# https://tracker.debian.org/pkg/gdal

set(version master)
set(download_hash SHA256=a06b47271827892f1897464c04a2a484f682f930d96b4d0329634512e973fe29)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't work for a dynamic target like master

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either don't use a hash for the tarballs, or use git instead.

@dg0yt
Copy link
Member

dg0yt commented Sep 16, 2020

I didn't try QGIS yet, except for the source step. But the other three packages build well Android Arm 64 bit. The CI should pick up geos via gdal when building OpenOrienteering Mapper. I can run CI with the QGIS target once Qt 5.15 is ready. Which needs an updated Android toolchain...

add_custom_target(protobuf-${patch_version}-source)
set_property(TARGET protobuf-${patch_version}-source
PROPERTY SB_SOURCE_DIR "${PROJECT_BINARY_DIR}/source/protobuf-source-${patch_version}/cmake"
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an undocumented way to handle a non-standard source directory. I use it for CI of OpenOrienteering Mapper (and CupCalculator), with Azure Pipeline's original git checkout. I should use it for libpolyclipping, too.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, it took me a while to figure out a workaround

@dg0yt dg0yt force-pushed the latest branch 2 times, most recently from 8c719f1 to a9133f7 Compare September 16, 2020 20:55
@dg0yt dg0yt force-pushed the latest branch 2 times, most recently from 6f56643 to eb201ee Compare September 17, 2020 05:52
@m-kuhn
Copy link
Author

m-kuhn commented Sep 21, 2020

Libzip doesn't build with android-16 (

set(system_platform_armeabi-v7a android-16)
)
Bumping to android-21 fixes the build

@dg0yt
Copy link
Member

dg0yt commented Sep 21, 2020

Libzip doesn't build with android-16 (

set(system_platform_armeabi-v7a android-16)

)
Bumping to android-21 fixes the build

I guess this will need to become a configuration option. I'm going continue building for android-16 (Qt 5.12) as long as the good old Samsung Note tablets with S-Pen refuse to die even in hard field work.

@m-kuhn
Copy link
Author

m-kuhn commented Sep 21, 2020

I guess it's already configurable, untested

if(NOT "$ENV{ANDROID_PLATFORM}" STREQUAL "")
foreach(abi ${supported_abis})
set(system_platform_${abi} "$ENV{ANDROID_PLATFORM}")
endforeach()
elseif(DEFINED ANDROID_PLATFORM)
foreach(abi ${supported_abis})
set(system_platform_${abi} "${ANDROID_PLATFORM}")
endforeach()
endif()

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants